When we are using the old API, make all items "is_important". That way

Wed Nov 12 01:29:32 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we
	are using the old API, make all items "is_important". That way
	BOTH_HORIZ will continue to show both icon and label in old API
	mode.

diff --git a/ChangeLog b/ChangeLog
index fe41dd56a901392a5a27efecf8a70bc09242d20b..1607d0ca20ed274d9a5242cbb04c2c7de49d5de2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 12 01:29:32 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we
+       are using the old API, make all items "is_important". That way
+       BOTH_HORIZ will continue to show both icon and label in old API
+       mode.
+
 Mon Nov 10 00:40:41 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkeventbox.c (gtk_event_box_set_above_child): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fe41dd56a901392a5a27efecf8a70bc09242d20b..1607d0ca20ed274d9a5242cbb04c2c7de49d5de2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Nov 12 01:29:32 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we
+       are using the old API, make all items "is_important". That way
+       BOTH_HORIZ will continue to show both icon and label in old API
+       mode.
+
 Mon Nov 10 00:40:41 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkeventbox.c (gtk_event_box_set_above_child): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fe41dd56a901392a5a27efecf8a70bc09242d20b..1607d0ca20ed274d9a5242cbb04c2c7de49d5de2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Nov 12 01:29:32 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we
+       are using the old API, make all items "is_important". That way
+       BOTH_HORIZ will continue to show both icon and label in old API
+       mode.
+
 Mon Nov 10 00:40:41 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkeventbox.c (gtk_event_box_set_above_child): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fe41dd56a901392a5a27efecf8a70bc09242d20b..1607d0ca20ed274d9a5242cbb04c2c7de49d5de2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Nov 12 01:29:32 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we
+       are using the old API, make all items "is_important". That way
+       BOTH_HORIZ will continue to show both icon and label in old API
+       mode.
+
 Mon Nov 10 00:40:41 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkeventbox.c (gtk_event_box_set_above_child): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fe41dd56a901392a5a27efecf8a70bc09242d20b..1607d0ca20ed274d9a5242cbb04c2c7de49d5de2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Nov 12 01:29:32 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_internal_insert_element): When we
+       are using the old API, make all items "is_important". That way
+       BOTH_HORIZ will continue to show both icon and label in old API
+       mode.
+
 Mon Nov 10 00:40:41 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkeventbox.c (gtk_event_box_set_above_child): 

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index d30b62cb41de8b562fb3740bcb8c4662576a61b5..77532815f450ac56f2ca2d314d21b0a3fc99001c 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -3457,6 +3457,12 @@ gtk_toolbar_internal_insert_element (GtkToolbar          *toolbar,
       break;
     }
 
+  /*
+   * When we are using the old API, consider all items "is_important". That
+   * way BOTH_HORIZ will continue to show both icon and label in old API mode
+   */
+  gtk_tool_item_set_is_important (item, TRUE);
+
   gtk_widget_show (GTK_WIDGET (item));
   
   if (type == GTK_TOOLBAR_CHILD_BUTTON ||